Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 28 Mar 2012 07:06:14 +0000 (00:06 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 28 Mar 2012 07:06:14 +0000 (00:06 -0700)
commit020b69f2fae8d5a01df215f6443dd24e9ea714d8
treea7e1611f71ce5d4e933089af0e87c6511d35a81b
parent11f53818302ca5c0e5741b5ddbc3cb840ce9195d
parentdfd787dbe5ba997ee3103f8f816f6fcf8fc0e13c
Merge from trunk.